Rename rgba test file

Not testing GdkColor here, anymore.

diff --git a/gdk/tests/Makefile.am b/gdk/tests/Makefile.am
index 75dd9b4cea180d6a7961356ca27a6baee619c7fb..e4743374628d12a2b6930a1ec2250628c8f82c51 100644 (file)
--- a/gdk/tests/Makefile.am
+++ b/gdk/tests/Makefile.am
@@ -19,9 +19,9 @@ progs_ldadd = \
 #check_gdk_cairo_SOURCES  = check-gdk-cairo.c
 #check_gdk_cairo_LDADD    = $(progs_ldadd)
 
-TEST_PROGS        += gdk-color
-gdk_color_SOURCES  = gdk-color.c
-gdk_color_LDADD    = $(progs_ldadd)
+TEST_PROGS   += rgba
+rgba_SOURCES  = rgba.c
+rgba_LDADD    = $(progs_ldadd)
 
 TEST_PROGS        += encoding
 encoding_SOURCES   = encoding.c

diff --git a/gdk/tests/gdk-color.c b/gdk/tests/gdk-color.c
deleted file mode 100644 (file)
index af69c20..0000000
--- a/gdk/tests/gdk-color.c
+++ /dev/null
@@ -1,120 +0,0 @@
-#include <locale.h>
-#include <gdk/gdk.h>
-
-static void
-test_color_parse (void)
-{
-  GdkRGBA color;
-  GdkRGBA expected;
-  gboolean res;
-
-  res = gdk_rgba_parse (&color, "foo");
-  g_assert (!res);
-
-  res = gdk_rgba_parse (&color, "");
-  g_assert (!res);
-
-  expected.red = 100/255.;
-  expected.green = 90/255.;
-  expected.blue = 80/255.;
-  expected.alpha = 0.1;
-  res = gdk_rgba_parse (&color, "rgba(100,90,80,0.1)");
-  g_assert (res);
-  g_assert (gdk_rgba_equal (&color, &expected));
-
-  expected.red = 0.4;
-  expected.green = 0.3;
-  expected.blue = 0.2;
-  expected.alpha = 0.1;
-  res = gdk_rgba_parse (&color, "rgba(40%,30%,20%,0.1)");
-  g_assert (res);
-  g_assert (gdk_rgba_equal (&color, &expected));
-
-  res = gdk_rgba_parse (&color, "rgba(  40 % ,  30 %  ,   20 % ,  0.1    )");
-  g_assert (res);
-  g_assert (gdk_rgba_equal (&color, &expected));
-
-  expected.red = 1.0;
-  expected.green = 0.0;
-  expected.blue = 0.0;
-  expected.alpha = 1.0;
-  res = gdk_rgba_parse (&color, "red");
-  g_assert (res);
-  g_assert (gdk_rgba_equal (&color, &expected));
-
-  expected.red = 0.0;
-  expected.green = 0x8080 / 65535.;
-  expected.blue = 1.0;
-  expected.alpha = 1.0;
-  res = gdk_rgba_parse (&color, "#0080ff");
-  g_assert (res);
-  g_assert (gdk_rgba_equal (&color, &expected));
-}
-
-static void
-test_color_to_string (void)
-{
-  GdkRGBA rgba;
-  GdkRGBA out;
-  gchar *res;
-  gchar *res_de;
-  gchar *res_en;
-  gchar *orig;
-
-  /* Using /255. values for the r, g, b components should
-   * make sure they round-trip exactly without rounding
-   * from the double => integer => double conversions */
-  rgba.red = 1.0;
-  rgba.green = 128/255.;
-  rgba.blue = 64/255.;
-  rgba.alpha = 0.5;
-
-  orig = g_strdup (setlocale (LC_ALL, NULL));
-  res = gdk_rgba_to_string (&rgba);
-  gdk_rgba_parse (&out, res);
-  g_assert (gdk_rgba_equal (&rgba, &out));
-
-  setlocale (LC_ALL, "de_DE.utf-8");
-  res_de = gdk_rgba_to_string (&rgba);
-  g_assert_cmpstr (res, ==, res_de);
-
-  setlocale (LC_ALL, "en_US.utf-8");
-  res_en = gdk_rgba_to_string (&rgba);
-  g_assert_cmpstr (res, ==, res_en);
-
-  g_free (res);
-  g_free (res_de);
-  g_free (res_en);
-
-  setlocale (LC_ALL, orig);
-  g_free (orig);
-}
-
-static void
-test_color_copy (void)
-{
-  GdkRGBA rgba;
-  GdkRGBA *out;
-
-  rgba.red = 0.0;
-  rgba.green = 0.1;
-  rgba.blue = 0.6;
-  rgba.alpha = 0.9;
-
-  out = gdk_rgba_copy (&rgba);
-  g_assert (gdk_rgba_equal (&rgba, out));
-
-  gdk_rgba_free (out);
-}
-
-int
-main (int argc, char *argv[])
-{
-        g_test_init (&argc, &argv, NULL);
-
-        g_test_add_func ("/color/parse", test_color_parse);
-        g_test_add_func ("/color/to-string", test_color_to_string);
-        g_test_add_func ("/color/copy", test_color_copy);
-
-        return g_test_run ();
-}

diff --git a/gdk/tests/rgba.c b/gdk/tests/rgba.c
new file mode 100644 (file)
index 0000000..d23bb96
--- /dev/null
+++ b/gdk/tests/rgba.c
@@ -0,0 +1,120 @@
+#include <locale.h>
+#include <gdk/gdk.h>
+
+static void
+test_color_parse (void)
+{
+  GdkRGBA color;
+  GdkRGBA expected;
+  gboolean res;
+
+  res = gdk_rgba_parse (&color, "foo");
+  g_assert (!res);
+
+  res = gdk_rgba_parse (&color, "");
+  g_assert (!res);
+
+  expected.red = 100/255.;
+  expected.green = 90/255.;
+  expected.blue = 80/255.;
+  expected.alpha = 0.1;
+  res = gdk_rgba_parse (&color, "rgba(100,90,80,0.1)");
+  g_assert (res);
+  g_assert (gdk_rgba_equal (&color, &expected));
+
+  expected.red = 0.4;
+  expected.green = 0.3;
+  expected.blue = 0.2;
+  expected.alpha = 0.1;
+  res = gdk_rgba_parse (&color, "rgba(40%,30%,20%,0.1)");
+  g_assert (res);
+  g_assert (gdk_rgba_equal (&color, &expected));
+
+  res = gdk_rgba_parse (&color, "rgba(  40 % ,  30 %  ,   20 % ,  0.1    )");
+  g_assert (res);
+  g_assert (gdk_rgba_equal (&color, &expected));
+
+  expected.red = 1.0;
+  expected.green = 0.0;
+  expected.blue = 0.0;
+  expected.alpha = 1.0;
+  res = gdk_rgba_parse (&color, "red");
+  g_assert (res);
+  g_assert (gdk_rgba_equal (&color, &expected));
+
+  expected.red = 0.0;
+  expected.green = 0x8080 / 65535.;
+  expected.blue = 1.0;
+  expected.alpha = 1.0;
+  res = gdk_rgba_parse (&color, "#0080ff");
+  g_assert (res);
+  g_assert (gdk_rgba_equal (&color, &expected));
+}
+
+static void
+test_color_to_string (void)
+{
+  GdkRGBA rgba;
+  GdkRGBA out;
+  gchar *res;
+  gchar *res_de;
+  gchar *res_en;
+  gchar *orig;
+
+  /* Using /255. values for the r, g, b components should
+   * make sure they round-trip exactly without rounding
+   * from the double => integer => double conversions */
+  rgba.red = 1.0;
+  rgba.green = 128/255.;
+  rgba.blue = 64/255.;
+  rgba.alpha = 0.5;
+
+  orig = g_strdup (setlocale (LC_ALL, NULL));
+  res = gdk_rgba_to_string (&rgba);
+  gdk_rgba_parse (&out, res);
+  g_assert (gdk_rgba_equal (&rgba, &out));
+
+  setlocale (LC_ALL, "de_DE.utf-8");
+  res_de = gdk_rgba_to_string (&rgba);
+  g_assert_cmpstr (res, ==, res_de);
+
+  setlocale (LC_ALL, "en_US.utf-8");
+  res_en = gdk_rgba_to_string (&rgba);
+  g_assert_cmpstr (res, ==, res_en);
+
+  g_free (res);
+  g_free (res_de);
+  g_free (res_en);
+
+  setlocale (LC_ALL, orig);
+  g_free (orig);
+}
+
+static void
+test_color_copy (void)
+{
+  GdkRGBA rgba;
+  GdkRGBA *out;
+
+  rgba.red = 0.0;
+  rgba.green = 0.1;
+  rgba.blue = 0.6;
+  rgba.alpha = 0.9;
+
+  out = gdk_rgba_copy (&rgba);
+  g_assert (gdk_rgba_equal (&rgba, out));
+
+  gdk_rgba_free (out);
+}
+
+int
+main (int argc, char *argv[])
+{
+        g_test_init (&argc, &argv, NULL);
+
+        g_test_add_func ("/rgba/parse", test_color_parse);
+        g_test_add_func ("/rgba/to-string", test_color_to_string);
+        g_test_add_func ("/rgba/copy", test_color_copy);
+
+        return g_test_run ();
+}